diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-10-22 09:15:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 09:15:19 +0200 |
| commit | d7a921cad9d646844c4b21977131ccb0ecf34e6f (patch) | |
| tree | 159e098f5828d0fcb3dfa318858c8f9073395328 /pkgs/desktops | |
| parent | 3ca78c1a12a89c5e59fd39589a1092625a2e8e5a (diff) | |
| parent | b6ba25ce95e5a26839a1be58a8f26c19d5231192 (diff) | |
| download | nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.gz nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.bz2 nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.lz nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.xz nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.zst nixpkgs-d7a921cad9d646844c4b21977131ccb0ecf34e6f.zip | |
Merge pull request #71221 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnustep/make/builder.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 017ced6c98b..aa50aa18c40 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,7 +24,6 @@ lib.makeScope pkgs.newScope (self: with self; { libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; - vala = pkgs.vala_0_44; gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; # ISO installer @@ -358,4 +357,6 @@ lib.makeScope pkgs.newScope (self: with self; { gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`"; nautilus-sendto = throw "deprecated 2019-09-17: abandoned"; + + inherit (pkgs) vala; # added 2019-10-10 }) diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 1655a75eeba..66afe1271ca 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -16,7 +16,7 @@ wrapGSMake() { export GNUSTEP_CONFIG_FILE="$config" -exec "$wrapped" "\$@" "\${extraFlagsArray[@]}" +exec "$wrapped" "\$@" EOF chmod +x "$program" } |