diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-17 22:21:56 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-17 22:26:49 +0100 |
commit | 747e75750077bb5b378140d43eac1c17547fa1fc (patch) | |
tree | 5f1a451fb23bf931efb8fbc9fe621fbf9110dac5 /pkgs/desktops/gnome-2 | |
parent | 4aa1dff1d6bba2d7c64503bbe142d819a289c5e3 (diff) | |
download | nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.tar nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.tar.gz nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.tar.bz2 nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.tar.lz nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.tar.xz nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.tar.zst nixlib-747e75750077bb5b378140d43eac1c17547fa1fc.zip |
libunique: fix build, make the package unique
The one in gnome2 was failing to build, but all there is likely in a desolate state anyway. In gmpc it also seemed without any reason to have a duplicate.
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/platform/libunique/default.nix | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index ce8d9e54c723..cecd56ad4f27 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -1,4 +1,4 @@ -{ callPackage, self, stdenv, gettext, gvfs, overrides ? {} }: +{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }: { __overrides = overrides; @@ -67,7 +67,7 @@ startup_notification = callPackage ./platform/startup-notification { }; # Required for nautilus - libunique = callPackage ./platform/libunique { }; + inherit (libunique); gtkglext = callPackage ./platform/gtkglext { }; diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix deleted file mode 100644 index 6b9cee800429..000000000000 --- a/pkgs/desktops/gnome-2/platform/libunique/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl_gnome, pkgconfig, gtk}: - -stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurl_gnome { - project = "libunique"; - major = "1"; minor = "1"; patchlevel = "6"; - sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk ]; -} |