diff --git a/flake.lock b/flake.lock index 8594aab..790fc24 100644 --- a/flake.lock +++ b/flake.lock @@ -319,17 +319,17 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "lastModified": 1765656911, + "narHash": "sha256-qbtEoFMWDsK/LpNF7hSb8ddF3cc6G8T8VWBaBCoiACM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "rev": "3ae3649b51d4e5d7ffa827719456d3e0e1b6af07", "type": "github" }, "original": { "owner": "nixos", + "ref": "release-25.11", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ea6faeb..d59747c 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/63dacb46bf939521bdc93981b4cbb7ecb58427a0"; + nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; systems.url = "github:nix-systems/x86_64-linux"; godot.url = "git+https://github.com/SimulaVR/godot?rev=d4bfd13c124cae3393aacfdf97433bb1e8f79d92&submodules=1"; godot-haskell.url = "git+https://github.com/SimulaVR/godot-haskell?rev=b06876dcd2add327778aea03ba81751a60849cc8&submodules=1"; @@ -82,16 +82,22 @@ pkgs.haskellPackages.uuid ]; + library-paths = lib.strings.concatStringsSep " " ( + builtins.map ( + drv: + "${drv}/lib" + ) buildInputs + ); + installPhase = '' mkdir -p $out/lib - cp -r ${ - lib.strings.concatStringsSep " " ( - builtins.map ( - drv: - "${drv}/lib/ghc-${pkgs.haskellPackages.ghc.version}/lib/${pkgs.stdenv.system}-ghc-${pkgs.haskellPackages.ghc.version}/*.so" - ) buildInputs - ) - } $out/lib + echo After directories creation + + for path in ${library-paths} + do + find $path -type f -name '*.so' \ + | xargs -i cp -r {} $out/lib + done ''; }; @@ -103,12 +109,6 @@ exec ${pkgs.xfce.xfce4-terminal}/bin/xfce4-terminal "$@" ''; - midori-wrapped = pkgs.writeScriptBin "midori" '' - #!${pkgs.stdenv.shell} - export XDG_DATA_HOME=${pkgs.dejavu_fonts}/share - exec ${pkgs.midori}/bin/midori "$@" - ''; - i3status-forked = inputs.i3status-fork.packages.${system}.default; i3status-wrapped = pkgs.writeScriptBin "i3status" '' @@ -300,7 +300,6 @@ mimic xclip xfce4-terminal-wrapped - midori-wrapped i3status-wrapped xorg.xkbcomp xwayland